Merge git://git.denx.de/u-boot-sh
authorTom Rini <[email protected]>
Tue, 6 Mar 2018 01:24:17 +0000 (20:24 -0500)
committerTom Rini <[email protected]>
Tue, 6 Mar 2018 01:24:17 +0000 (20:24 -0500)

Trivial merge